315. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:07 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

315.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_layout.less2016-02-17 06:18:20 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/web/css/source_layout.less2021-02-08 23:48:48 +0000

315.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged10242
Changed636
Inserted11
Removed23

315.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

315.4 Active regular expressions

No regular expressions were active.

315.5 Comparison detail

1 // /** 1 // /**
2 //  * Copyright © 2015 Magento. All rights reserved. 2 //  * Copyright © 2015 Magento. All rights reserved.
3 //  * See COPYING.txt for license details. 3 //  * See COPYING.txt for license details.
4 //  */ 4 //  */
5  5 
6 @layout-column-main__sidebar-offset: 2%; 6 @layout-column-main__sidebar-offset: 2%;
7 @layout-column__additional-sidebar-offset: @layout-column-main__sidebar-offset; 7 @layout-column__additional-sidebar-offset: @layout-column-main__sidebar-offset;
8  8 
9 // 9 //
10 //    Common 10 //    Common
11 //-------------------------------------- 11 //--------------------------------------
12  12 
13 & when (@media-common = true) { 13 & when (@media-common = true) {
14  14 
15 .columns { 15 .columns {
16     #lib-layout-columns(); 16     #lib-layout-columns();
17     .column.main { 17     .column.main {
18         &:extend(.abs-add-box-sizing all); 18         &:extend(.abs-add-box-sizing all);
19         .lib-vendor-prefix-flex-grow(1); 19         .lib-vendor-prefix-flex-grow(1);
20         .lib-vendor-prefix-flex-basis(100%); 20         .lib-vendor-prefix-flex-basis(100%);
21         .lib-css(padding-bottom, @indent__xl);    
22         .lib-vendor-prefix-order(1); 21         .lib-vendor-prefix-order(1);
23         max-width: 100%; 22         max-width: 100%;
24     } 23     }
25     .sidebar-main { 24     .sidebar-main {
26         &:extend(.abs-add-box-sizing all); 25         &:extend(.abs-add-box-sizing all);
27         .lib-vendor-prefix-flex-grow(1); 26         .lib-vendor-prefix-flex-grow(1);
28         .lib-vendor-prefix-flex-basis(100%); 27         .lib-vendor-prefix-flex-basis(100%);
29         .lib-vendor-prefix-order(1); 28         .lib-vendor-prefix-order(1);
30         max-width: 100%; 29         max-width: 100%;
31     } 30     }
32     .sidebar-additional { 31     .sidebar-additional {
33         &:extend(.abs-add-box-sizing all); 32         &:extend(.abs-add-box-sizing all);
34         .lib-vendor-prefix-flex-grow(1); 33         .lib-vendor-prefix-flex-grow(1);
35         .lib-vendor-prefix-flex-basis(100%); 34         .lib-vendor-prefix-flex-basis(100%);
36         .lib-vendor-prefix-order(2); 35         .lib-vendor-prefix-order(2);
37         max-width: 100%; 36         max-width: 100%;
    37         padding: 20px 0;
38     } 38     }
39 } 39 }
40  40 
41 .page-main { 41 .page-main {
42     padding-top: 20px; 42     padding-top: 20px;
43     padding-bottom: 50px; 43     padding-bottom: 40px;
44      44 
45     > .page-title-wrapper .page-title { 45     > .page-title-wrapper .page-title {
46         font-size: 20px; 46         font-size: 20px;
47         margin: 0 0 15px; 47         margin: 0 0 15px;
48         color: @theme-color; 48         color: @theme-color;
49     } 49     }
50 } 50 }
51  51 
52 } 52 }
53  53 
54 // 54 //
55 //    Mobile 55 //    Mobile
56 //-------------------------------------- 56 //--------------------------------------
57 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) { 57 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__l) {
58     .breadcrumbs,    
59     .page-header .header.panel,    
60     .header.content, 58     .header.content,
61     .footer.content, 59     .footer.content,
62     .page-main, 60     .page-main,
63     .page-wrapper > .widget, 61     .page-wrapper > .widget,
64     .page-wrapper > .page-bottom, 62     .page-wrapper > .page-bottom,
65     .block.category.event, 63     .block.category.event,
66     .top-container { 64     .top-container {
67         padding-left: @layout__width-xs-indent; 65         padding-left: 10px;
68         padding-right: @layout__width-xs-indent; 66         padding-right: 10px;
69     } 67     }
70     .page-main { 68     .page-main {
71         .account &, 69         .account &,
72         .cms-privacy-policy & { 70         .cms-privacy-policy & {
73             position: relative; 71             position: relative;
74             padding-top: 41px; 72             padding-top: 41px;
75         } 73         }
76     } 74     }
77 } 75 }
78  76 
79 // 77 //
80 //    Desktop 78 //    Desktop
81 //-------------------------------------- 79 //--------------------------------------
82 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 80 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__l) {
83     .navigation, 81     .navigation,
84     .breadcrumbs,    
85     .page-header .header.panel,    
86     .header.content, 82     .header.content,
87     .footer.content, 83     .footer.content,
88     .page-wrapper > .widget, 84     .page-wrapper > .widget,
89     .page-wrapper > .page-bottom, 85     .page-wrapper > .page-bottom,
90     .block.category.event, 86     .block.category.event,
91     .top-container, 87     .top-container,
92     .page-main { 88     .page-main {
93         padding-left: 15px; 89         padding-left: 10px;
94         padding-right: 15px; 90         padding-right: 10px;
95         margin-left: auto; 91         margin-left: auto;
96         margin-right: auto; 92         margin-right: auto;
97         width: auto; 93         width: auto;
98         max-width: @layout__max-width; 94         max-width: @layout__max-width;
99         box-sizing: border-box; 95         box-sizing: border-box;
100     } 96     }
101     .page-main { 97     .page-main {
102         width: 100%; 98         width: 100%;
103         .lib-vendor-prefix-flex-grow(1); 99         .lib-vendor-prefix-flex-grow(1);
104         .lib-vendor-prefix-flex-shrink(0); 100         .lib-vendor-prefix-flex-shrink(0);
105         .lib-vendor-prefix-flex-basis(auto); 101         .lib-vendor-prefix-flex-basis(auto);
106         .ie9 & { 102         .ie9 & {
107             width: auto; 103             width: auto;
108         } 104         }
109     } 105     }
110  106 
111     .columns { 107     .columns {
112         display: block; 108         display: block;
113     } 109     }
114  110 
115     .column.main { 111     .column.main {
116         #lib-layout-columns > .main(); 112         #lib-layout-columns > .main();
117         &:extend(.abs-add-box-sizing-desktop all); 113         &:extend(.abs-add-box-sizing-desktop all);
118         min-height: 300px; 114         min-height: 300px;
119     } 115     }
120  116 
121     .sidebar-main { 117     .sidebar-main {
122         #lib-layout-columns > .left(); 118         #lib-layout-columns > .left();
123         padding-right: @layout-column-main__sidebar-offset; 119         padding-right: @layout-column-main__sidebar-offset;
124         &:extend(.abs-add-box-sizing-desktop all); 120         &:extend(.abs-add-box-sizing-desktop all);
125     } 121     }
126  122 
127     .page-layout-2columns-right .sidebar-main { 123     .page-layout-2columns-right .sidebar-main {
128         padding-right: 0; 124         padding-right: 0;
129         padding-left: @layout-column-main__sidebar-offset; 125         padding-left: @layout-column-main__sidebar-offset;
130     }
 126     }b
131     
132     .sidebar-additional {    
133         #lib-layout-columns > .right();    
134         padding-left: @layout-column__additional-sidebar-offset;    
135         clear: right;    
136         &:extend(.abs-add-box-sizing-desktop all);    
137     }    
138     
139     .page-layout-2columns-left {    
140         .sidebar-additional {    
141             padding-right: @layout-column__additional-sidebar-offset;    
142             padding-left: 0;    
143             clear: left;    
144             float: left;    
145         }    
146     }    
147  127 
148     .panel.header { 128     .panel.header {
149         padding: 10px 20px; 129         padding: 10px 20px;
150     } 130     }
151 } 131 }

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.